Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:47:50 +0000 (20:47 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:47:50 +0000 (20:47 +0300)
commit33ddd0164c876a06b7ebd37eeb6f62b36e42dec8
treeac3c8a0b604d2a7f26d8e755fb993addd39e6623
parenteb7270604b7ab6e92dd4f2a219060d23fe8b8ba7
parent2a8a1bea13899f80c851a8d355e52cc5f445d322
Merge from trunk.
configure.ac
lisp/Makefile.in
lisp/subr.el